projects / ostree.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 391ad0e) | patch
deploy: Add --no-merge
authorColin Walters <walters@verbum.org>
Tue, 21 Apr 2020 19:25:40 +0000 (19:25 +0000)
committerColin Walters <walters@verbum.org>
Wed, 22 Apr 2020 14:09:54 +0000 (14:09 +0000)
commit368574b6577c9039887e207be1c0501d4c4ef8d0
treec989ae1f0d5874f7bf8394b896efde480a62471ctree | snapshot
parent391ad0ec214ac4065348165ee2d88c3fdb50bf82commit | diff
deploy: Add --no-merge

All of the underlying libostree APIs have supported passing `NULL`
for a merge deployment for...a long time.  But we never plumbed
it up into the CLI.

Add a `--no-merge` option to aid people who want to do a "factory reset":
https://github.com/ostreedev/ostree/issues/1793
.cci.jenkinsfile diff | blob | history
Makefile-tests.am diff | blob | history
src/ostree/ot-admin-builtin-deploy.c diff | blob | history
tests/test-admin-deploy-nomerge.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.